bitkeeper revision 1.1159.217.10 (41e4efd62HR6KHx5S8553JDf-xT3zg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc tools/misc/xend
index e6235349b56c59cbf97a5bbc3dd9b921e43f4c11,d19a4868f6391e0efddc5911b9f4e0c04aa9f4a0..5c9757ec23203d42b7a2ed6333c3e855b711ba43
--- 1/tools/misc/xend
--- 2/tools/misc/xend
+++ b/tools/misc/xend
@@@ -21,15 -21,9 +21,15 @@@
  """
  import os
  import sys
 +import socket
 +import time
 +
 +XCS_PORT = 1633
 +XCS_EXEC = "/usr/sbin/xcs"
 +XCS_LOGFILE = "/var/log/xcs.log"
  
  # Default install path for Xen binary packages.
- sys.path.append('/lib/python')
+ sys.path = [ '/usr/lib/python' ] + sys.path
  from xen.xend.server import SrvDaemon
  
  class CheckError(ValueError):